From a25bc9a0b73d192e2ce53e98aa36e479bb44c192 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Wed, 8 Feb 2006 15:20:43 +0000 Subject: [PATCH] free temporary paths after usage (patch from maemo-gtk), 2006-02-08 Kristian Rietveld * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_ref_path), (gtk_tree_model_filter_unref_path): free temporary paths after usage (patch from maemo-gtk), (gtk_tree_model_filter_clear_cache): fix little typo in the docs (patch from maemo-gtk). * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): remove stale FIXME. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ gtk/gtktreemodelfilter.c | 6 +++++- gtk/gtktreemodelsort.c | 1 - 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 845f9e46cf..3718f16b68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-02-08 Kristian Rietveld + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_ref_path), + (gtk_tree_model_filter_unref_path): free temporary paths after + usage (patch from maemo-gtk), + (gtk_tree_model_filter_clear_cache): fix little typo in the docs + (patch from maemo-gtk). + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): remove + stale FIXME. + 2006-02-08 Matthias Clasen * gtk/gtkfilesystem.c (gtk_file_info_copy): Copy the display_key diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 845f9e46cf..3718f16b68 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +2006-02-08 Kristian Rietveld + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_ref_path), + (gtk_tree_model_filter_unref_path): free temporary paths after + usage (patch from maemo-gtk), + (gtk_tree_model_filter_clear_cache): fix little typo in the docs + (patch from maemo-gtk). + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): remove + stale FIXME. + 2006-02-08 Matthias Clasen * gtk/gtkfilesystem.c (gtk_file_info_copy): Copy the display_key diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index 0895d6d1fe..d34b3269b8 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -2818,6 +2818,8 @@ gtk_tree_model_filter_ref_path (GtkTreeModelFilter *filter, gtk_tree_model_ref_node (GTK_TREE_MODEL (filter->priv->child_model), &iter); gtk_tree_path_up (p); } + + gtk_tree_path_free (p); } static void @@ -2837,6 +2839,8 @@ gtk_tree_model_filter_unref_path (GtkTreeModelFilter *filter, gtk_tree_model_unref_node (GTK_TREE_MODEL (filter->priv->child_model), &iter); gtk_tree_path_up (p); } + + gtk_tree_path_free (p); } static void @@ -3344,7 +3348,7 @@ gtk_tree_model_filter_refilter (GtkTreeModelFilter *filter) * gtk_tree_model_ref_node(). This might be useful if the child model * being filtered is static (and doesn't change often) and there has been * a lot of unreffed access to nodes. As a side effect of this function, - * all unreffed itters will be invalid. + * all unreffed iters will be invalid. * * Since: 2.4 */ diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index f8df268b17..1b89e460a2 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -767,7 +767,6 @@ gtk_tree_model_sort_row_has_child_toggled (GtkTreeModel *s_model, gtk_tree_path_free (path); } -/* FIXME: I still have doubts if this works */ static void gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model, GtkTreePath *s_path, -- 2.30.2